# Conflicts:
#	package-lock.json
#	package.json

# Conflicts:
#	package-lock.json
#	package.json
#	packages/design-system/src/forms/NewFormikColorPicker.stories.tsx
#	packages/design-system/src/forms/NewFormikColorPicker.tsx
#	packages/design-system/src/forms/NewFormikDateChanger.stories.tsx
#	packages/design-system/src/forms/NewFormikDateChanger.tsx
#	packages/design-system/src/forms/NewFormikDateField.stories.tsx
#	packages/design-system/src/forms/NewFormikDateField.tsx
#	packages/design-system/src/forms/NewFormikNumberField.stories.tsx
#	packages/design-system/src/forms/NewFormikNumberField.tsx
#	packages/design-system/src/forms/NewFormikPinField.stories.tsx
#	packages/design-system/src/forms/NewFormikPinField.tsx
#	packages/design-system/src/forms/NewFormikSelectField.stories.tsx
#	packages/design-system/src/forms/NewFormikSelectField.tsx
#	packages/design-system/src/forms/NewFormikSwitchField.stories.tsx
#	packages/design-system/src/forms/NewFormikSwitchField.tsx
#	packages/design-system/src/forms/NewFormikTextField.stories.tsx
#	packages/design-system/src/forms/NewFormikTextField.tsx
#	packages/design-system/src/forms/NewFormikTextareaField.stories.tsx
#	packages/design-system/src/forms/NewFormikTextareaField.tsx
#	packages/design-system/src/forms/SelectField.stories.tsx
#	packages/design-system/src/forms/SelectField.tsx
#	packages/design-system/src/forms/TextareaField.stories.tsx
#	packages/design-system/src/forms/TextareaField.tsx

# Conflicts:
#	package-lock.json
#	package.json

…shadcn (#76)

* initial trials with a V3 setup using vite and shadcn

* scaffold button

* working build with vite

* build tailwind

* enhance: add vite-based version of design system including Shadcn (#119)

* start vite migration

* chore: upgrade pnpm

* add prettier

* add constants and copy, format

* updates

* initialize shadcn

* delete design system v3

* upgrade prettier etc

* install tailwind plugins

* add ladle

* ts for ladle

* working ladle with our design system theme

* fix package manager entry in package.json

* unknown instead of any

* update deps

* format

* no jsx in tsconfig.node.json

* add checkbox

* more components

* add all old components

* move to original design system folder

* consistency

* format syncpack

* add engines

* button impoirt

* add dayjs peer dep

* add formik peer dep

* run prettier

* add postcss import peer dep

* add size limit preset

* enhance: add shadcn navigation-menu

* add initial set of components

* add resizable

* resolve conflict in primary color naming

* run prettier

* add textarea and fix styling in ladle

* generate all missing shadcn components

* start adding stories

* readd lost percentage sign

* more fixes in building vite stuff

* build updates

* ^ for types deps

* add ^ to peer deps

* import tailwind with relative path

* restore original index.ts

…147)

* feat(FormikDatetimePicker): add new formik datetime picker component

* chore: generated and build files

…mponent

…ent (#148)

* feat: introduce new formik pin field based on shadcn otp input component

* chore: update generated files and formatting

* chore: add docstrings

…y accepted by typescript

…bled prop on new modal component, update date picker formatting

* enhance(Toast): replace toast component with sonner-based version

* chore: make sure toast is exported correctly

…rea component

… with other components

…ible and fix dropdown trigger styling

…yling options for new modal components

…l layout

…ooltips are shown despite content overflow (#150)

* chore: set maximum width on tooltip

* chore: remove portal from popover to ensure usability of dependent components inside modal

* wip: add temporary modal story for testing

* fix: ensure that dialog component works in combination with popover, etc.

…er and datetime picker

…on modal

… for major release (#151)